UPSTREAM_SHORT_HASH:=680dba8
